Merge pull request #886 from dp-arm/dp/stack-protector

author davidcunado-arm <[email protected]>

Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)

committer GitHub <[email protected]>

Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)
author davidcunado-arm <[email protected]>
Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)
committer GitHub <[email protected]>
Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)
diff --cc Makefile
Simple merge
diff --cc docs/user-guide.md
Simple merge
diff --cc plat/arm/board/juno/platform.mk
Simple merge
author	davidcunado-arm <[email protected]>
	Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)
committer	GitHub <[email protected]>
	Thu, 6 Apr 2017 09:20:47 +0000 (10:20 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.md	patch \|	diff1 \|	diff2 \|	blob \| history
plat/arm/board/juno/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history